Skip to content

gerrit: Update documentation - #10074

Queued
josephlou5 wants to merge 2 commits into
mainfrom
josephlou5-rwukonnmrrrm
Queued

gerrit: Update documentation#10074
josephlou5 wants to merge 2 commits into
mainfrom
josephlou5-rwukonnmrrrm

Conversation

@josephlou5

@josephlou5 josephlou5 commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added/updated tests to cover my changes
  • I fully understand the code that I am submitting (what it does,
    how it works, how it's organized), including any code drafted by an LLM.
  • For any prose generated by an LLM, I have proof-read and copy-edited with
    an eye towards deleting anything that is irrelevant, clarifying anything
    that is confusing, and adding details that are relevant. This includes,
    for example, commit descriptions, PR descriptions, and code comments.

@josephlou5
josephlou5 requested a review from a team as a code owner August 28, 2026 16:21
Comment thread docs/config.md Outdated
@josephlou5
josephlou5 force-pushed the josephlou5-rwukonnmrrrm branch from 82aba1a to 3b3a563 Compare August 29, 2026 02:03

@yuja yuja left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

cc @matts1

Comment thread cli/src/commands/gerrit/upload.rs
Comment thread docs/gerrit.md Outdated
@josephlou5
josephlou5 force-pushed the josephlou5-rwukonnmrrrm branch 2 times, most recently from 0f9b761 to 71032d9 Compare August 29, 2026 02:54
@josephlou5

Copy link
Copy Markdown
Contributor Author

I'll give it a day or two in case @matts1 has any objections or thoughts.

@matts1 matts1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but some minor nits

Comment thread cli/src/commands/gerrit/upload.rs Outdated
Comment thread cli/src/commands/gerrit/upload.rs Outdated
@josephlou5
josephlou5 force-pushed the josephlou5-rwukonnmrrrm branch 2 times, most recently from 7b3d406 to 171bb38 Compare August 31, 2026 01:48
- Made all references to Gerrit's "change ID" concept consistently say
  `Change-Id`, and all Jujutsu's "change ID" concept say "change ID"
  (the latter was only updated in Gerrit-related documentation; I didn't
  look everywhere).
- Changed "footer" to "trailer" everywhere.
- Made "patch set" two words everywhere (Google says two words is more
  correct, I guess).
- Added a "Gerrit" section in `docs/config.md`, which is a more concise
  list of the options explained in `docs/gerrit.md`.
`Change-Id` or `Link` values added during `jj gerrit upload` (i.e., when
the commit didn't have either of these trailers before) may cause
divergence when fetching from the remote after a change is merged: same
jj change ID, but different commit ID due to the different descriptions.
@josephlou5
josephlou5 force-pushed the josephlou5-rwukonnmrrrm branch from 171bb38 to fc57b79 Compare August 31, 2026 17:20
@josephlou5
josephlou5 added this pull request to the merge queue Aug 31, 2026
Any commits made after this event will not be merged.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants